Merge "Stop passing the netid to clatd." am: bbacc7ec00

Change-Id: I1905dc524b6da5dd8b2f0f246506ed40592efdb2