This reverts commit b28f007e. Reason for revert: Causing pre-submit failure b/126704033 Change-Id: I17c99cd410b3fa3825d01fedd21a52451368b5c0