Merge cherrypicks of [16215817, 16232311] into security-aosp-rvc-release.

Change-Id: Ie9b22166c5f414b30022f20f8f7034ec42986f3c