3b99a6c7d6
This reverts commitc0b289c93e. Reason for revert: fixed in ag/10826395 Bug: 151727009 Change-Id: I0c71d5d47a6825c2445bf8dc9d8a9a1ca23f9e64 (cherry picked from commit08c4d99237)