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

Change-Id: Idb96ab95b1ea69a636f315edeb84c8ba025d75bd