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

Change-Id: I71962f1f2147a87dbe9b6a01448583d235e37ce1