Merge "Unhide constructors of DataService and NetworkService."
am: 272769c41a

Change-Id: I9c892244ef457a00e59700eb634cdef08b749046