This reverts commit ac6bbdb6. Reason for revert: b/177065099 Change-Id: I11d8a498f25b3e734a28f160a6b65c5b5720a38d