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

Change-Id: Id9f39d3873868143b3812b167b402388f4149ff6