Merge "Use correct timebase in fg service notifications." into oc-dev