Merge cherrypicks of [16207306, 16184352] into rvc-platform-release.

Change-Id: If6b77e5a51c708d5f1f4e7e8fd90379346413110