This reverts commit eca2762d. Reason for revert: culprit of b/255702022 Change-Id: I0071a7a2bccf829ecc8f25ad8da6597b0a21de6f