Merge "Add new test for job timing out while work is enqueued." into oc-dev am: fc70d4de6e
am: fb46abf674

Change-Id: Ie48a59fe6984cb8238bf8844c259d31ee6cc9e1c