Revert submission

Reason for revert: 146032426

Bug: 146032426
Change-Id: I95e2d4ea78de8f318e8da13e9400722087054faa
(cherry picked from commit b1c4e2dd9f031a9b42b63af2b176b67f69db4b78)
1 file changed