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

Change-Id: I533e90a556e2a2d4148f25a3fd9f1e6b5756fbfb