am 65699d14: am 499d6840: Merge "Remove obsolete keystore path"

* commit '65699d14fab37ab374ce46c6192d4e9b56ec26c1':
  Remove obsolete keystore path