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

Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992