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

Change-Id: I9d3993bcb27ff949f39b62b4c9366a5d2f1ec325