Merge cherrypicks of [19952027] into security-aosp-rvc-release. Change-Id: Iefd522501501af25cd3b98a340496290f5ca10ea