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

Change-Id: Ia2cf4d8a5c15ed433ac7c6d066deb95093be4492