Bug: 30832954 Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f (cherry picked from commit 9a236066)