am 10680627: am a6869700: Merge "Fix tests after inet changes in...
am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
automerge: 19b6ae0f
* commit '19b6ae0f':
Fix tests after inet changes in NetworkController