Merge cherrypicks of [16101567, 16145002] into security-aosp-rvc-release.

Change-Id: I2a15faca68aeaa4a026ef74930b68b4f01c6e41f