Merge remote-tracking branch 'upstream/ics' into jellybean-stable