Merge "Add logic to eagerly resolve const-string for startup methods"