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

Change-Id: Icd7cf75211b00a50be6ebda0eca2d1397e5519af