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

Bug: 27552463
Change-Id: If679eb64b849d8e50b33d437ed55a0ca2b1a77c8