Merge "Remove obsolete state" into qt-dev
am: 47b4c6d5df

Change-Id: I77420c36cedf3eeb0299e6565c612c61daa1b9a4