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

Change-Id: Ib0639990f512be221afff3c305862e8cc80287f9