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

Change-Id: I777b0fe5d423add331fd85eee2450a2efa6d1201