Merge "listByInterface -> listManifestByInterface" am: 40983e6ab7
am: 2fa525797f

Change-Id: I0b46cd63ec70f6c7eea7bf3ac72c9f1a4fa70fa7