am 3bad7fe9: Merge "KeyStore: stop using state()"

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '3bad7fe9d311844dd6533c73630d6cb7e4da785a':
  KeyStore: stop using state()