Revert "Revert "Merge remote-tracking branch 'upstream/jellybean' into HEAD""

This reverts commit 83ec6a6db7970c41b0a5a93e3d676e12f686b549.