Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-mr1-dev am: 919e982c3f
am: 96c4176210

Change-Id: I38f38fd3b1c349dd938f41b199f572628c9987d7