Manual revert for ag/5373283
(cherry picked from commit 8bda570a74d943fb03606f00afb6d735aaec0841)

Change-Id: I4ac238d8e357ecb1751ea1c07dc6f495c8a3b83a
1 file changed