Merge "Add missing spaces in constructing args"
am: 0e3a330f4a

Change-Id: I8695b4ab53520a31325a59533dd189fcaf020e03