Bug: 16404669 (cherry picked from commit b05d350b) Change-Id: I7bf7745684747bad8564f168d0def71878566e8c