Merge branch 'jb-mr1' into HEAD
Merge branch 'jb-mr1' of https://github.com/pcarenza/android_vendor_motorola_xt925 into jb-mr1