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

Change-Id: I368465a5a8865ea056a865bc08b77fc03c17175b