This reverts commit ff8fca7d9e.
Reason for revert: broke build when combined with ag/5781147
Bug: 120706174
Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407
This reverts commit ff8fca7d9e.
Reason for revert: broke build when combined with ag/5781147
Bug: 120706174
Change-Id: Id543bc3cb0b4979144e92c400e57988009f4c407