Merge cherrypicks of [19610023, 19612360] into security-aosp-rvc-release.

Change-Id: Ie06ea7635ea8cd5db8f759ce70fc240ef98ba2de