Merge "Prevent NPE when draw is called without bounds being set Test: unit...
Merge "Prevent NPE when draw is called without bounds being set Test: unit test inside AdaptiveIconDrawableTest.java" into oc-dev am: 891e0320
am: d16d1788
Change-Id: I96db9ee1a5bb9fc2085e43733638a6b21f50fe65