Fix issue with Swift 2.3
Fix issue with Swift 2.3

ed-chin/EarlGrey,ed-chin/EarlGrey,sskhandp/EarlGrey,artyom-razinov/EarlGrey,saurabhj80/EarlGrey,ed-chin/EarlGrey,sskhandp/EarlGrey,artyom-razinov/EarlGrey,google/EarlGrey,artyom-razinov/EarlGrey,ed-chin/EarlGrey,google/EarlGrey,artyom-razinov/EarlGrey,sskhandp/EarlGrey,saurabhj80/EarlGrey,google/EarlGrey,sskhandp/EarlGrey,sskhandp/EarlGrey,ed-chin/EarlGrey,artyom-razinov/EarlGrey,saurabhj80/EarlGrey,google/EarlGrey,google/EarlGrey,saurabhj80/EarlGrey,saurabhj80/EarlGrey