Merge "Fix memory corruption in SpotShadow" am: 8c85c00b5e am: 8c8353a8c3
am: 5bb2fdb425

* commit '5bb2fdb425dab346fb83c7f2bf9afa03bdf79fd6':
  Fix memory corruption in SpotShadow