Rematch requests first and listens second. am: 72bbf4829d
am: 836a5db809

Change-Id: Ia57cd548b2920efaee733f5cb0df66139a6e55e6