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

Change-Id: I9cc142700e42d0348b7708e432e5732249bd4eef