Integrated missing changes for openxface-ios

[git-p4: depot-paths = "//xFace-Apollo/branches/openxface-ios/": change = 16505]