Merge "Unhide constructors of DataService and NetworkService." into pi-dev
am: 271ba383b6

Change-Id: If6a55e8d996d3b4ef1595271577b005933c752db