Merge "Change the Listener API names" am: fe6978a73f am: 05430c9d1f am: bc79a1c468
am: b162d468fd

Change-Id: I2a124eee09111e3418e663faef0ff95266a3866f