272f4541f9
Bug: 171707437
Test: Repro steps in bug
This reverts commit 3f8d868110.
Change-Id: I909ab701c674fe975982a7de06dc9e89dcd03aea