Merge "listByInterface -> listManifestByInterface" am: 0d55bb0756 am: fa5a2f5b75
am: 0dd3908911

Change-Id: I004adbce0ecb12407f99f58ec7d1ff462209b23b