DO NOT MERGE Bug1097988 dataservices in api