Merge "Revert "Depecrate flags, and try to match them to actions"" into qt-dev
am: aaae9b2426

Change-Id: Id7e68afdd276724518f830c9d0699e0e235ed45f