Merge "Fix roam icon issues in Austria" into nyc-dev
am: 8d6477c7a0

* commit '8d6477c7a0b05edf02e1b1c323d55997b6b4f8e1':
  Fix roam icon issues in Austria