Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1

Change-Id: I9f0c2fba03c6afb6864595fc7561b3ec88b25a2f
Merge branch 'jb-mr1' of https://github.com/KainGC/frameworks_base into jb-mr1