[automerger skipped] Merge "Remove obsolete state" into qt-dev am: 47b4c6d5
am: c4ef1973 -s ours
am skip reason: change_id I17fcd9eb5eba7e7bc88de09309f5c310fe13433f with SHA1 de8c25ac is in history
Change-Id: Ic0400d7b367436fc78c5a119e1f9841c71c87ac9