Merge "Always note the state of RNDIS from USB broadcasts." into oc-dr1-dev