Bug: 28605638 Change-Id: Idbf2d59c20b7dda1efb9aa61bce2cefbe2c0040a (cherry picked from commit 0ed0521a)