am 8b6cf279: Merge "Enhancements to workload scripts" into mnc-dev

* commit '8b6cf2796dc179b339b12e52d17b56d2519358fe':
  Enhancements to workload scripts