This reverts commit 14499f01. Reason for revert: b/312408745 Change-Id: I8b03799fe6e0e256263240909ee7446c178bf508