Merge remote-tracking branch 'remotes/goog/lmp-mr1-gce-dev'