Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev
am: a04451827e

Change-Id: I722f3400659581bc01b4bfadce34c5d61142b71d