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

Change-Id: I9f2b0d94f10e69f40906354f9bf2bfa2d18925c3