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

Change-Id: I88bde899d803a4654f40dd667e82c729b7f0d936