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

* commit '0be28a7f5351af556f2fd29dbc68cb97b57b2eac':
  Add child_address call extra.