Bug: 26814204 (cherry-picked from commit 311a97e7) Change-Id: Id00ac095e45dbdc63e9542f4f3a20c2179c3ab72