Merge "Don't enumerate interfaces if no interfaces were found." am: ae3d675a71

Change-Id: I59af144182b3d6aa8705551c1a3cda108b575dfe