Merge remote-tracking branch \'goog/master\' into nyc-dev
am: 6ec2c6e54d

* commit '6ec2c6e54d301ef84ec0c064c310a153b9465aed':