This reverts commit 97d64ea8a1. Reason for revert: b/204891006 Change-Id: I9d40a5c8c9bce6b818779ebaf748bb9bd9231caf
97d64ea8a1