This reverts commit 09bd8a6e. Reason for revert: Broke the build on git_master Change-Id: I8e77fbc5d6f6b0c51f1b7432d5ed014c871428b4