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

Change-Id: I67951e184ef30e59e11d26cf3eecdec65dc758b0