Merge "init: fix DumpState() logging" am: f31abeb973
am: a968df9edb

Change-Id: If589ba5eea3f66cc450f5be13bf7054ae8e89d57