Merge cherrypicks of [19981385, 20100213] into security-aosp-rvc-release.

Change-Id: I7c5478f7472d92d218cb19cd32165319cee57783