Merge "Merge "Fix roam icon issues in Austria" into nyc-mr1-dev am: 914354f334 am: f3f5022a7f am: 4c6d8f5ee2"