am 3ad91aa7: Merge "keystore-engine: comment out unused args"

* commit '3ad91aa75ad07b20a48dad04dae3902b3eaccc4c':
  keystore-engine: comment out unused args