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

Change-Id: I5d851b00b92c88bf9b23bbdd021c207714abd6d9