[automerger skipped] Merge "Remove services.net JAR dependency" am: 60ff003a9d am: 14e10c3b10
am: 6d5c54db07  -s ours

Change-Id: I07679a8c99adec35775d222e1543e11bfe6cdce1