Revert submission

Reason for revert: Trying to reland the changes with fix for build errors.

Change-Id: I9971b9c22621fae7ddd9b91a49239efea68918ee
2 files changed