ff6d94dd92
Bug: 171707437 Test: Repro steps on bug This reverts commit0ad7b172e6. Change-Id: If30cbb6c155e879dc8307a0a4a06dfb548b389a1 (cherry picked from commit4b4341d3a7)