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

Change-Id: I6b9ae91409bcf0ce713efc8c03ba0d417f249cb1