Merge "Revert "Exception when applying the two new icon shapes"" into...
Merge "Revert "Exception when applying the two new icon shapes"" into rvc-d1-dev am: 4f681b14 am: a3803b6a am: aac2481c am: 869a25e8
Change-Id: I69b4e88ed88e43506d39e621a7cdd42218b77ee7