[automerger skipped] Merge "Schematize Crypto system properties" am: b837a44716 am: a078a02c42
am: 9602f7eb0b -s ours
am skip reason: change_id I65a6ce1a682687702f4c8b5c2e054eaaf91c389b with SHA1 3737da3ae6 is in history

Change-Id: I1bfc2de7781bb2036c68daae22d45b3738c4b30e