Merge "Make hybrid interface descriptors StaticString16" am: 48b66ef08b am: 87f022ecf3
am: 62efcc9e44

Change-Id: Ia5b615f5f8d1a1aa1863a274b8ff1ec1b23d19d6