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

Change-Id: I7909076f349fc7b1adf1f5374217b188ca665c78