Merge "Account for static child transformations correctly"