Merge "Fix issues with TRON app transition logging" into oc-mr1-dev