Merge "Supported data enabled override for different scenarios"
am: 8939a89ea3

Change-Id: Icfb2d94b2c0debb0262dbd0587d9143f543304eb