Merge "Bug fix for NPE if FGS stop log called before FGS start" into udc-dev