This reverts commit 327de4b4. Reason for revert: b/182016372 Change-Id: I67ec01fc2f47b05a2dc11e7951c11a708fdbeebf