Merge "Remove erroneous space in unset() call"