Bring inline with AOKP
Merge remote-tracking branch 'origin/jb-mr1' into jb-mr1