fix compiler warnings

Change-Id: Ic3e5bbaf9824ef35a7a71209a5cd6bf868f96adb
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0