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

Change-Id: I0463d2eb6c51a70cf725f5aa6073e1a94fc81ed0