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

Change-Id: Ie8cc3d6e4dcd819638d8f8e2189539143489bcd1