Revert "Temporary revert to fix the build."

This reverts commit d1cda72457fed396942ae58f689ce84de7af3e9e.

Change-Id: Ia072e7adee68a1fbb21ae0f9fa38d61b461fb39f
8 files changed