Merge "String16: operator<<" am: 824418c370 am: fddc5b2fb1 am: 3b9b60c70c

Change-Id: If8fbaca1ab88dd538ddf4425e1b7bd8abede77a6