Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am: a49681fab8

Change-Id: Ie09391bfb304ef6721c672e3a63078f9d66f95af