Merge remote-tracking branch 'base/lollipop' into recents