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