[[ Merge-6_7_rc-3 ]] Update the S/B with 6.6.4 fixes for iOS8