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

Change-Id: Ib22bdced0abf7cc737511907ff6b0dff187f8593