Merge "Optimizing: Clean up constant location handling." am: fe0ec35c68
am: c080a0964f

* commit 'c080a0964f78da2430604ddcbdf88cc182bedd74':
  Optimizing: Clean up constant location handling.