Merge "Add stats logging to ServiceManager and NPMS" into pi-dev