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