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

Change-Id: I394aee0312d1412bfbd2f4fbe2c66e66fef26069