Merge change 20095

* changes:
  Fix network order for marshalling in keystore interface.