Fix build warnings.

Change-Id: I20117cf287ca25387c8664de2096c00ef63ec1e5
Merge branch 'cm-10.2' into martincz