Merge \\"Mutate the drawable if a valid state change happen\\" into nyc-dev am: 486c76b5ef
am: 526dba474a

Change-Id: I202a1bc736c7599c0f9421bcc348a4d5d201a06f