Merge "Moving alarm service dump to IndentingPrintWriter"