am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1

* commit '09cbff0294a27d33c93de50e0b4471ad86154a84':
  Better handles' visibility test