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

Bug: 27552463
Change-Id: Icaacbb9acf1454b39974d319d30023aea6fea5f6