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

* commit 'f226c16c53350942c75a1191d5d7a4c30a223aac':
  Allow listeners to see children