(cherry pick from commit 74541338) Bug: 27965066 Change-Id: Ia0690c544876e209e4c080b0e959f763b731c48a