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

Change-Id: I345a581282c3c24facefef95df3d57e898783b31