Merge cherrypicks of [16460072] into security-aosp-rvc-release.

Change-Id: I8fa49223506e5c4a1559f2ea1204187d7be8ba7b