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

Change-Id: I8d3108ea69eb3bcab546e9725a6211fc2f3c3e17