(cherry picked from commit eb2c8254) Bug: 27218415 Change-Id: Ie4dc1876a20567240267f309dc18f1aec2c1b4c2