This reverts commit 175805bb. Seems the merger was blocked, all the underlying changes are now in. Change-Id: I92802dde26f868caa757247c055ec40557606798