fixup

Change-Id: I6a4656fc17e18ad6474c4de636e9437d48e01e1c
fix compile error with CM-10.2

Change-Id: Ic171e0c081c59dd1df958fe0affcd03786fe9d34
Revert "fixup"

This reverts commit a25d786a56a53198b29fcf7647ee1431a56c9158.