Look also for iOS SDK 8.0

Change-Id: I0587e395f6b4833953618b1a0ac1e201a1f79b61
Rename misleadingly named variable

Change-Id: I48c7e2d29c16b61b71ef72a0a45792c968c0fa0f