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

Change-Id: Id82e6e02810abfa7bba76226c8defa20025eab8e