Fix a routing bug for generic subcontrollers.

Change-Id: I3764da98f19f02c1f28a29377c6d24238d869930
Fixes-bug: 1361728
Merge "Fix a routing bug for generic subcontrollers."