Merge changes I4b9a6778,I2a249eaa

* changes:
  Store XfrmDirection in XfrmSpInfo
  Move Address Pair to Separate Struct