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

Change-Id: If7b7fb125532999642a72c4295f90dfa3622bfc6