Merge "listByInterface -> listManifestByInterface" am: 877c7f5ce1 am: 5427525c6b
am: 10363938d7

Change-Id: Ic63c0a06c2a11a04a3608c0fdeed0eb199f0c9ee