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

Bug: 27616343
Bug: 27851582
Bug: 27693977
Bug: 27690481
Bug: 27799205
Bug: 27683071
Bug: 27625564

Change-Id: I261eb9f3e8144e85233dc4313e674e75f812003c