Remove duplicate spaces

Change-Id: Icc70c9c3b19701f103ceb46fb04f76a82d83a4f7
Merge "Remove duplicate spaces"