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

Change-Id: I44a10eaa285d0521669781a4fafb7641df209186