Merge "Support dumping mainline relevant service pre-boot into bugreport"