Revert "Revert "Temporary revert to fix the build.""

This reverts commit a0dafc9aacecdf45cbc20f1d0acbff789f56e607.

Change-Id: I3b1b3a0b3f5c43c0d8f6dc0b6f2f5738b09c1e81
8 files changed