This reverts commit 10ea6214. Reason for revert: b/254136231 Change-Id: I68884b0540557b9abc9e6661c1ff5dbeb7e9816d