Merge cherrypicks of [15975347, 15975348, 15975349, 16508592, 16508593, 16508594, 18029504] into rvc-platform-release.

Change-Id: I9692f16cffaa3e77737c5d3050be5528c5046c53