Revert "Revert "Merge remote-tracking branch 'aosp/jb-mr1.1-release' into jellybean""

This reverts commit c746986db9d87ff590a73581eb18c75ab47b6bce.