This reverts commit 56a712f6c9. Reason for revert: forward fix is at aosp/1265379 Exempt-From-Owner-Approval: relanding of an already approved CL Change-Id: I0d93417939d570ce21f105ee4b3bae6414194dbe
56a712f6c9