Merge "Remove services.net JAR dependency"
am: 60ff003a9d

Change-Id: I8024f076ae6c74287d6de9e1354d43fee1ca96ee