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

Change-Id: Ib624b6b31e4fe6b2fb37f854b069c93feb3b1c2d