Fix warnings for gcc 4.9

Change-Id: I2c1273de446b8c3fd1d31f8cb03b5c6a7069e40b
Merge branch 'cm-11.0' into kk_mkt