Merge "Supported data enabled override for different scenarios"
am: 3a0e57df0a

Change-Id: Iabadaf5b286454c5969fed2261b12ddb2aa565aa