Merge branch 'master' into rvc-dev

Bug: b/150704780