Merge changes Id1b9ae00,I48723e00

* changes:
  Merge remote-tracking branch 'upstream/master' into upstream_merge
  Merge remote-tracking branch 'upstream/master' into upstream_merge