am 68af4661: am 61cffb06: Merge "Change the test to user the listener mechanism" into ics-mr1

* commit '68af4661b0c611a3303ff4e32ffd1659d45e5b02':
  Change the test to user the listener mechanism