[DO NOT MERGE] Making various icon shape options as non-translatable skipped: 1f5a264fac

Change-Id: I43204d5c2de0650a65cbf36b0e56a7fda092388d