remove extra spaces
merge from apks-957067