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

Change-Id: I48d5202d0dbcc9edb68b744813410ebf4caf98b0