what the fuck, google

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