Merge in Netgear bcmrobo changes