This reverts commit 874cc385. Reason for revert: causes build break b/172387048 Change-Id: I652161584c78be8e03e0668ce15325c41109e213