Bug: 27942453 (cherry picked from commit dfbbeef1) Change-Id: Ie474f4d830237d015436158829264b8bdf0a7194