Merge "BLAST: Descriptive adapter layer names" into rvc-dev am: 7eb72faa am: 9741d80b am: 831f06d9 am: 1c04efbc Change-Id: I5569d871fed2f0b23ecff0c5c22e063db6780228