[AUR-3109] Fixing problems for new tilez users

Change-Id: I69f1db5935b778965e7e180226f0bbe471e5d835