Merge "Marking icon paths as non-translatable" into ub-launcher3-dorval
am: 3b31df70ea

Change-Id: I1130bc6e1a55f92ded5e44fd2c571e8d47013099