Merge cherrypicks of [19747497, 19748339, 19680252, 19698977] into rvc-platform-release.

Change-Id: I3086d05984f3a7fc04883ec41415f3d08f814d36