Merge "Add logic to eagerly resolve const-string for startup methods"
am: 4e4557a892

Change-Id: I8d042a11f992f312f767d2b87825d3715cb68d05