Merge "Add child_address call extra." into mnc-dr-dev