This reverts commit db56188f. Reason for revert: b/156335617 Bug: 156335617 Change-Id: I8bface28e7d3896dd03a997f179c3fb62b5e96de