(cherry pick commit 2d6327d0ad) Bug: 21491908 Change-Id: I84d93aa73eebc327513c4663a6b606e2dad9a0b7
2d6327d0ad