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

Change-Id: Ifdfb305b41a19c68e1818d7c085701aa9d61847e