Merge fixes

Change-Id: Ib1c1a9adb12c4d0b0a7c4edff972733b1557a283
Merge remote-tracking branch 'aokp/jb-mr2' into HEAD

Change-Id: I8b279df9b3138e744e8514c55fa9e1f03050618e