Merge "Fix JobSchedulerServiceTest." into rvc-dev am: 6f55fa3c am: cd47df24 am: 2b226509 am: 844db694 Change-Id: Id006eea439dabb2bd2c562f8f0ff27f57f70f48b