Merge "Fix clipping on 3g icon" into oc-mr1-dev am: 3cd17ebd27
am: bfcc29ac3a

Change-Id: Idd4f85f26f9cff3ea790ce989f8c7a750ffd5f5c