Merge "Schematize Crypto state system property"
am: 6c38df5eff

Change-Id: I3ef29bc153839fd18b1144c8128ddf4dbc1e4f60