This reverts commit 864df040. Reason for revert: underlying reason for revert is fixed Bug: 132986546 Change-Id: I9037a51286f37159182e0f27e147816f1e59839a