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

Change-Id: I00b06af8a6709776fac289d7b6fb9c832ad77def