am bb4ae1d2: Merge "Removing landscape string overrides" into ub-now-queens

* commit 'bb4ae1d26a11a1211ce793278a878fa3cb224ff5':
  Removing landscape string overrides