Merge "OMS: add systrace logs"