Fix whitespace error

Change-Id: I3013ef329a7a87a8041d8f7a2441e12093da5403
Merge remote-tracking branch 'upstream/ics' into ics-plus