This reverts commit 179e1ee1. Reason for revert: build breakage (b/152543627) Change-Id: I437c99613732a5feb4ecbd082598f2efa5853c1e