Merge "Fix issues with TRON app transition logging" into oc-mr1-dev
am: 9db99f4e23

Change-Id: I60369174d96333cd2703bc765d6d1ddc0f4ab48e