Merge "Monitor fold to AOD latency" into tm-qpr-dev