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

Change-Id: Ie32c3107026409693d4fa11cab2047e00362c2b6