am 16062128: Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev

* commit '160621280d7eaba7eeddc183c4c11aa49d32e30e':
  Allow more scaling values to be tuned in resource overlays