am ceb8f90f: am c33316c8: am f226c16c: Merge "Allow listeners to see children" into lmp-dev

* commit 'ceb8f90f014f7d040d5b6f2d4cfa176c8bcd4334':
  Allow listeners to see children