Merge "Modify catch when addInterfaceToLocalNetwork() is called." am: ccd6a0f6c2 am: c7b925063f
am: 48396e8616

Change-Id: Idb98c57e8e1791eefdf47f9127696211a4ff3a99