3.6

Change-Id: I28c664470bc2a975948bf5e18b0c9298c4bdca1a
Not quite time for that yet

Change-Id: I7bc7d1445aa87062c793d2d977395d5293f5ef0f
Merge remote-tracking branch 'upstream/jellybean' into jellybean