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

Change-Id: Ifd27f5d908947cd7b4e1b8d54f9fa87e43ebb11b