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

Change-Id: I737d8c90ec5c04bfc94342668cb7de7cc0ec4584