modification for swift_1.10

Change-Id: Ia360f8ec62612dd2fbcde9c7c0238c0bdfa8eb44