This reverts commit 8f35d505. Reason for revert: possibly b/184141588 Change-Id: I8c6262ec8ce5561f8d398a81492b6f5217dba834