This reverts commit 44da627f. Reason for revert: <fix build> Change-Id: I6f9ae2fc7606547e6bf6f9d8d6c2fc309b5a4538