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

Change-Id: Ie7aba6cc3c62eaea05a5a7bd233541cdc6b9e942