Merge "Add string prefix optimization" am: 10c62239a2
am: 97159762d1

Change-Id: I9a7bbab52a77487be496f599d89d2b00284f3e89