am 13d8d2d6: am c270b8d9: am 44dfaf26: 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 '13d8d2d6682fbfba3262d1485c6cebf9665d751e':