Merge cherrypicks of [9640791] into rvc-release

Change-Id: I18cce13ecb62e97e9be77386d3bcfd670aad2438