Merge "Test fix: Handle missing dummy0 network interface" am: b07021ff08
am: b1714cca7b

Change-Id: Ifb33708fb436d002a7d5152008302e7d85efe18f