Merge remote-tracking branch 'goog/master' into gb-ub-photos-arches