This reverts commit 6f78dbd2b7 due to b/65225023. Change-Id: I6ca3780afb8d47b77219d6b5a06760042f684c4b
6f78dbd2b7