Bug: 28555675 (cherry picked from commit 8ca33bf0) Change-Id: I9236df283f2e83ca5dcde01f73dc0522d745cd59