Merge "Added data service interface" am: 3965e3bbc6
am: 5f12e2c76d

Change-Id: Iac4b6e1b86cdfa2e3285a086220b7c7aa921d7ff