Merge "String16: operator<<" am: 824418c370

Change-Id: I2ee6e01d1898aa2fec3df5caaa440eef314aeb66