Merge cherrypicks of [12425228, 12425136, 12425209, 12425138] into rvc-release

Change-Id: Icc7e1e436e5c03cc5d14c9a022998549ecce57b6