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

Bug: 27552463
Change-Id: Ib32111bd227168159f9255ffcb46ece02a8d9b64