Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Change-Id: If429b6eba4fcd30e62b73839d6516c95c8520593