[automerger skipped] Merge "Schematize Crypto system properties" am: 03c14760a5 am: f7b3bdb53b
am: 2969a3f40f -s ours
am skip reason: change_id I141ae3a011f9cb3ea283ca25175205b6af966ec6 with SHA1 a974418519 is in history

Change-Id: I1f19d367386bc9ace695f73a2da21a71f15dd806