Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev