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