Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am: 4d72cd9550
am: ce680bfd06

Change-Id: I07401f285ae1abe18bf3932bf79618759f24c9bd