Merge "Schematize Crypto state system property" am: 88b57a2c4d
am: d5f216ac8b

Change-Id: I38fa65ef0864d8a40eb7546ad50ab254e7e0ec25