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

Change-Id: I0fa736f29d7adeb98afa0791b8d1a6c9fc5522ad