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

* commit 'a8205d24703fc353076cf30795b3a06a87208cfa':
  Better handles' visibility test