Merge remote-tracking branch 'goog/master' into rvc-dev. am: dd878a4270 am: e2f58f2b7d am: 1ac49050bd

Change-Id: Ief9d8c0c3f6cb81422bb26499c2d65b5c7ee5c03