Merge cherrypicks of [15759163] into rvc-platform-release.

Change-Id: I0569db17ece0e84a66fa55ca63a16cba12a75c2a