Merge "Added data service interface"
am: 3965e3bbc6

Change-Id: I7543aff2abadb4c6b2556f37cd5e763cb5a8c08c