Don't enumerate interfaces if no interfaces were found. am: 7b753522c0 am: 1c79886d80 am: a5bc19e1f5

Change-Id: Ib77d05a231675fae92e31f34598fee52c20b1ae0