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