Fix variable expansion.
Merge "Fix variable expansion."