Merge remote-tracking branch 'upstream/lollipop' into lollipop