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

Change-Id: Ia445e6c40261ad972e72ff8df2cd209462036fbf