Merge "keystore-engine: comment out unused args"