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

bug:27173201
bug:23128949
bug:26846185
Change-Id: I7333734be71a83dc4808735ead80ae3a4dcd841d