This reverts commit d3c44b51. Reason for revert: ag/9255655 may be a fix. Bug: 139860714 Change-Id: Ie10ca227aad80b81f39f7a4f949a9edd8feb0661