DO NOT MERGE Don't lock listener delivery am: 8aea09fecd

Change-Id: I0cc66c4170d9ef195442c9bc84380b14491e0bf4