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

Change-Id: I3354d653ae9defd925eddca1748734a47dae5ab8