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

Change-Id: I9aa2595a7c8024f4c5d34bc63a5d70ebce41ce15