Merge "KeyStore: stop using state()"
tree: 9f7693aee5e72893a2e1e06d68d7364dda7be76e
  1. core/
  2. services/