Bug: 30983968 Change-Id: I2189442755380ad5d04f80bcb5978ca0c28e6420 (cherry picked from commit 98253094)