Test: builds successfully This reverts commit 9319453998. Change-Id: I22bca4a32adf86040b9d72ad5b45999aba28f586
9319453998