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

Change-Id: I9f09c87cd4f738066c55d28fa7849fafdc33b7f9