Fixing Ukraine commonscat issue

Change-Id: Ie4482e304f043a8662ae344eebafda8316b508b5