am 88336c2e: Merge "Update foreground calls with child-parent call changes." into lmp-dev

* commit '88336c2e3410acef37c376547610013bed347013':
  Update foreground calls with child-parent call changes.