Merge "Revert "Add extra debug to capture system state"" into qt-dev am: 3abd182c39
am: 70bfd12924

Change-Id: Ifa844c35e9a60bee96090c19a5cf1ae98f41057b