Merge "Removing JobScheduler heartbeat code."