Supported data enabled override for different scenarios
am: e9e9cb3d51

Change-Id: Ib897f600a72179b90e3c2b49e6dfa054d8ec5b76