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

bug:27094810
bug:27149923
bug:27019403
bug:23128949
Change-Id: Iff7685a5000653a3c87d8ba8d316965b9592a594