Merge remote-tracking branch 'caf/kk_3.5_rb1.21' into cm-11.0-new

Change-Id: I8144dff8ab1942e249694e16937b093dac547847