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

Change-Id: I7d1fe46ae9ca0d34917c745769b021341ccf2f90