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

Change-Id: I2fcc3a468d1249bc4919d9e55eee52663132e5be