Fix non-deterministic compilation for const-string... am: 403aafa9f2
am: 4cfa8004ea

Change-Id: I2634f500071bd3e193ee92b198b87c167aebb869