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

Change-Id: I3ca3358be90dcafdb75b2f99db2d44b9df46074d