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

Change-Id: I525a01bb878eae8b73201f3b316f2a72f8c50a2a