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

Change-Id: I9c42777b96376ce009a22171911acd29aac15b85