Merge cherrypicks of [12196470, 12196437] into rvc-release

Change-Id: I9205a134047f72c6c3d7ece4c8aee06c938e3095