Merge "Fail if the interface is not available when starting" am: b331b02da9 am: a1f407d0f5
am: f5af0cede5

Change-Id: Ief3c8e1652f69af0276fe35946ae1bf6e6b1b57e