Merge remote-tracking branch 'CM/cm-10.1' into jellybean