Merge cherrypicks of [20084105] into security-aosp-tm-release.

Change-Id: I66fba5c0bc9673e5a565db90c97368c98ae4c502