am 9657ba0e: Merge "KeyStore: stop using state()"

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