Merge remote-tracking branch 'aosp/jb-mr1.1-release' into cm-10.1

Change-Id: I990ccbec1711dbbf82cffe209f064d6453ff43a9