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

Change-Id: If02631e54c5d410bf5c889ecb3a9f217318e5692