Merge remote-tracking branch 'goog/master' into nyc-dev

Bug: 27552463
Change-Id: If058b2de991c4813d49a5d844b8610405fb3bc5f