Merge "Ensure that Switch 9-path assets scale down" into lmp-mr1-ub-dev