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

Change-Id: Ia435721b293865403fe9972d8660c2448e68b387