Merge changes I91673d51,I50bc9e06

* changes:
  Corrected typo in magnification spec crop calculation.
  Generate stack override config in AM vs. WM