[TIDOC-1835][TIDOC-1874](3_4_X) Update for iOS 8 Changes