Merge "Actually use listener hints?" into pi-dev am: 571afb3b78
am: d3b217940b

Change-Id: Iccb1d70413bd4945d9ca045f3f1a91c6bd6f474c