Merge \"Fix CTS test for schedule-job deadlines\" into nyc-dev
am: 4a3bb1b8ae

Change-Id: I73962c5ce2c7102b309625c7efac81f1c82680e1