Merge cherrypicks of [16177015] into security-aosp-sc-release.

Change-Id: Ic9ec37d93e0f165333f368d01a122578d684ccb9