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

Change-Id: I6f8d26c56c1d709aa1c53ef49a133deca7555c7e