am 6eabacd4: am 140e79bb: Merge "Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)" into jb-ub-now-indigo-rose

* commit '6eabacd4999a543f8625027e9d223335ad56eb84':
  Workaround for small icons. Draw icon drawables at the expected icon size. (Bug 11203738)