Merge "Add missing library of services.net" am: f48f9b91b9
am: e063a8b66c

Change-Id: I014a1f0410cab78da0d9d1acf9408ee7c3fd5ca6