Merge changes from topic "netstack_jarjar_autogen"

* changes:
  Rename RegularMaintenanceTestService
  Do not jarjar classes in the target package