Merge "New policy for internal and wired device names." into mnc-dev