Merge "AOD: Scale icon padding with the drawing size" into oc-dev am: 59e16c9eb9
am: baf5dcb29d

Change-Id: I802470aeca3a9e124b724c04ace4eee35833b0e6