Merge remote-tracking branch 'goog/master' into rvc-dev am: e0379aae9b

Change-Id: I08848b2abf8b8b2990be510c82830a1f51d390e4