Merge "Fix metered-constraint job scheduler CTS test" into oc-dev
am: 7e60994777

Change-Id: I1aa69d14ae2e0c811197fb0b542d769b8ee77512