Merge "Add non platform services to telephony bugreport" into pi-dev