Bug: 26862970 Change-Id: Iaa88ac0266e5d2cac2837f1d13353aacc6177274 (cherry picked from commit 9ee76076)