Should fix the 056-const-string-jumbo test. (cherry picked from commit 0bff4f37) Change-Id: I38d03fa7f981f0c067c52782e57938bbcbabef17