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

Change-Id: I407983d32ce8d2a6758f0125963d128db496d225