remove space before semicolon

Change-Id: Ic0d890f5e27cec017c7f7910a67d53b2edf82079
Merge "remove space before semicolon"