Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2