Merge "Change the Listener API names"
am: fe6978a73f

Change-Id: Icf860de451298632635ad15ba0d1c7701b83073e