Revert submission

Reason for revert: 146032426

Bug: 146032426
Change-Id: I8990d59a08f5bf1fa583486813ecd13cb093dab8
(cherry picked from commit 815835d1936df0def6e117f59992f498f079c7b1)
6 files changed