Bug: 26814204 (cherry-picked from commit 9429a880a3) Change-Id: Ibd4f7a985ddcdb7564a79326ce846257882e294f
9429a880a3