Merge "Fix memory leak in String16"
am: 9a66161585

Change-Id: Iae22fa9a44cae53569fc760036e52d47965184a1