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

Change-Id: I179bcd9f26b255c5464a8f833e693911e12d1dc8