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

Change-Id: I37f564cb4b55572dae2a6cf93e2ba4528ddf8a93