Merge "Supported data enabled override for different scenarios"
am: 8959a121ce

Change-Id: Ic607bd5ad608c75002a71010f73fa3c672c5b51a