Bug: 27227225 (cherry picked from commit de84e51f) Change-Id: I7ebbd1cf9bff849ecdfc84e0e98842fec3215bb4