Merge remote-tracking branch 'goog/rvc-dev-plus-aosp' into mm am: 147afca1b8 am: 5cd86c8912

Change-Id: I8312d38c67ca2e57ade01e1ca38bc3dbb86da9bf