[automerger skipped] Merge "Supported data enabled override for different scenarios" am: 8939a89ea3 am: 13cfab8363 -s ours
am: 2e2c54baba -s ours
am skip reason: change_id I89653a47565c6e198715e716e3f2c1426e995613 with SHA1 b07d497b3e is in history

Change-Id: Iec2ea1716e1416bbc80e47d7043ac86588e17790