Merge "Supported data enabled override for different scenarios" into qt-dev
am: 02e9e32b90

Change-Id: Ibf541df3b68f476257f79ff458b55edf0efba9db