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

* commit 'c5c7987feaec7cf85b62e0c6f4048396482a729e':
  Add child_address call extra.