Merge "Actually terminate on EOF"
tree: 8a1e957f41a484a6b78656bb48889c038fe59bc3
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/