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

Change-Id: If3a547061ba878a42bcfba79fc61aed95795eb8f