[automerger skipped] Merge "Schematize Crypto state system property" am: 6c38df5eff am: 7dc288a899
am: 8b8bf4c39e -s ours
am skip reason: change_id I957a8e37a88f7bb6d5007a36c02952d3539580fe with SHA1 4d7bd6d85e is in history

Change-Id: I4df0425e2b933347ad52ec50f67db55428be5185