Merge cherrypicks of [15697458] into security-aosp-rvc-release

Change-Id: Ic735fde6365181d8ea007b033a3d3b85d1059f9f