Rename ::interface to ::interface::ip

Change-Id: Id5c079f7b89e358a89d7408bb57a3ea801f692c7
Merge "Rename ::interface to ::interface::ip" into production