Merge "Report app data fixup and prepare timings" into oc-dev