Update for swift 2.1.0

Change-Id: I811b476384beb5097ce69f4954eaf6c2dcb4fbcd