Merge remote-tracking branch 'goog/master' into rvc-dev. am: dd878a4270 am: 6dbb13a4d3 am: 27ee1c8b71

Change-Id: I520d55c910ff21d532119882cd09afd0c89a2baf