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

Change-Id: I258763b90eb635b31c58976cd3e4b969659903e7