Merge cherrypicks of [16579586, 16577204] into security-aosp-rvc-release.

Change-Id: I43441359b11d7198ed1cb6d31412d35763d24d3d