[DO NOT MERGE] Making various icon shape options as non-translatable am: 1f5a264fac  -s ours
am: 415e2aacf3  -s ours

Change-Id: I32b8a89b59b782848b0986dd855747893699bb3b