This reverts commit 5cf36637. Reason for revert: b/171938419 Change-Id: I81dd1c3482c6fcbc527ec737d158b9d9a23fcbbe