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

Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d