This reverts commit 91fb9aee. Reason for revert: b/283167416 Change-Id: I755567fc1e87c342a833ce0ea2dda91a91a65efe