Merge "Use correct timebase in fg service notifications." into oc-dev
am: 630e7841e5

Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346