This reverts commit 240b064cdb. Reason for revert: b/248344141 Change-Id: I559e583ddea4a68b4291ceb8ba119500d051ed36
240b064cdb