Merge "Added data service configuration support"
am: 2e9bdd78f2

Change-Id: Idc7da08a22dd13f508d37df31966fb8346485ec4