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