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

Change-Id: I639c31746ed2b96c59b12ae57878d6bef8495f12