Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev