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

Change-Id: Ie5a293cc7f9ab34373f49b165c2c9453fbd1df08