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

Change-Id: I47f6d9669c39060d70ba156bc121421c3dba9537