Merge cherrypicks of [15341486] into rvc-platform-release

Change-Id: Ic047f063127dce606285cbfcad02a5b541bcfc65