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

Change-Id: Ice1d8843cb05a5bd788f14554c863837963c5f78