Merge "Add latency tracking for aiai" into tm-dev