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

bug:25492619
bug:27520994
bug:27624718

Change-Id: I8dd1e90724f7b9694a1d493ce61f669123dd3ac4