Removes BIND_LISTENER from XYZTourist. am: e223e6c1 am: 481f9f7a am: cbe7ccca am: 0ab3ccb8 am: b379a167 am: e2682e92 am: f8c7d732 * commit 'f8c7d732': Change-Id: Ie10fcc4285aa8d58649ee60b4017e8abd2dbd752