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

Change-Id: I3d1d11db3b3fbb9d527bbe8b6978ba62c29fc7b3