[automerger skipped] Merge "Remove obsolete state" into qt-dev am: 47b4c6d5df -s ours
am: 0f9c0cf7bb -s ours
am skip reason: change_id I17fcd9eb5eba7e7bc88de09309f5c310fe13433f with SHA1 de8c25ac2d is in history

Change-Id: I34f61b0794fe72e21d9efdfacd68b113f186c02e