This reverts commit 9c54f032. Reason for revert: b/262940536 Bug: b/262940536 Change-Id: I8140eacc7ca8716f799561412cb5cef29df35d29