Merge "Do not assert router l3 agent association"