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

* commit '61cffb06334cd0677b70ef224f40d35822f720b3':
  Change the test to user the listener mechanism