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

Change-Id: I7205e6cd4e0b9f4dfc3067c77ffb7510a1577164