am 5a095ef2: am 03539a36: Merge "Ensure that the port number and TXID are...
am 5a095ef2: am 03539a36: Merge "Ensure that the port number and TXID are properly randomized." into jb-dev
* commit '5a095ef2':
Ensure that the port number and TXID are properly randomized.