Merge remote-tracking branch 'cm/jellybean' into sm-jb-mr1-wip