Bug: 26623636 (cherry-picked from commit c5064327) Change-Id: I05fc731356891c4fdba79701b1b87384841d56ca