Merge cherrypicks of [15951443, 16093381] into security-aosp-sc-release.

Change-Id: I22a13a2aeb26d8a63c4d4c6cd6bf5c9800199737