Merge fixes

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

Change-Id: I0f54616c277582340a8eba0a35fefd3758aa11ed