This reverts commit 882e59d4. Reason for revert: Breaking build on internal target Change-Id: I775f120ef140835ee4fe76db5cbbb33255f93b76