Merge cherrypicks of [11559179, 11556529] into rvc-release

Change-Id: I6e43521080be7f8b4393efe56ac4c29f9edbe859