Use resolve-startup-const-strings=true for run tests am: 7cb707ffe4
am: 73a3f370e2

Change-Id: I734dce2f9a888d3849af8112552226e406589e97