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

Change-Id: I903d91dff9c5a6b19a2d6f336f9dc8b0f249c1b3