Merge "Add extra logs for UDFPS rotation" into tm-dev