This reverts commit be3fd775. Reason for revert: Bug: 180987628 Change-Id: I2f981de9298d81206242ac203ce2298aa50c29ae