Merge "Remove obsolete state" into qt-r1-dev
am: cee9ee343d

Change-Id: Ibf362e0ca495fa6d929a1722e7649c63a3d2b6d6