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