This reverts commit a3f2be2b73. Test: compile Change-Id: I04b3a8e47e1fa3eb9d80c14ae3a90c68a780e858
a3f2be2b73