Merge "Framework: Avoid string allocations"