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

Change-Id: I1606596cfc64fb3a775bea7ac869e4ae7369c19f