Merge "Add ASCII vs UTF-16 string data analysis" am: ed28df642e
am: 03d673402c

Change-Id: I6b3d839a65c5c111e6bdf5a09e1141588b75a16a