Merge "Remove "import JobService" to remove build time dependency" am: ac335868bf am: 848155a0fb

Change-Id: Icff1d6211fbbe2a511aac937a6765a678419ebed