Merge "Schematize Crypto system properties" am: 03c14760a5
am: f7b3bdb53b

Change-Id: I47bbcec88d71840827653e9a70d91bf442ba1c22