Merge "Fix JobSchedulerServiceTest." into rvc-dev am: 6f55fa3c am: a4d35a59 am: 7bc36daa am: 30f85628 Change-Id: I353f5e942feb6d758d79fa6339078f0aafc40931