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

Change-Id: Ie1672f6e103dd59ee97b54681836d0e1fda7c2ae