am 499d6840: Merge "Remove obsolete keystore path"

* commit '499d68402f55bd1b8aa1a0d9c6966c7392704fba':
  Remove obsolete keystore path