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

Change-Id: Idff1817315dcaa47d3f0f407dabdc0df6bad2d2a