a7c9c14444
This reverts commit 395c58d303.
Reason for revert: The bug was fixed
Bug: 187899876
Change-Id: I73f93f5fb1ec0ab0352ba174aabbaf6935dd9fc4
Test: presubmit