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

Change-Id: I0cd4a8a1fd229f8d3c3a20390c87cf10c4b87863