Merge "Fix memory leak in String16" am: 9a66161585 am: 73ac1266c5 am: 230e0e6439
am: 5be5b534c9

Change-Id: Id969526579f98b9bbb21acab882617af9147e1c2