This reverts commit b325113980. Reason for revert: This never passed the Gerrit-CI validation and actually broke the build. Change-Id: Ib30ff6a4cae7c8927fa212dd5ae8b87c0cd0d9ef
b325113980