Merge "Schematize Crypto system properties"
am: 03c14760a5

Change-Id: Ic0bb3a6f206c68ce705c572ad5714475690a3b1c