Merge "Fix cutoff g in "Restarting"/"Shutting down" messages." into pi-dev
am: cf06ca0ec4

Change-Id: I695e7ca7c8f69cbfe2378b5c0aa13e1a18ac67b6