This reverts commit 50493f07. Reason for revert: build is now fully finalized Change-Id: Iaa5b9d84b84303a8b8baf30641d861a035169f48