Merge "Add string prefix optimization"
am: 10c62239a2

Change-Id: I68a7d02644870544baaec4bddca9436dce466949