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

Change-Id: Idfd6c7a57834441d125f605a4d3fbc1c5a5a3338