Merge "Change the test to user the listener mechanism" into ics-mr1