CU-868f1731u More fixes for ios and a build issue fix.#146

ucswift merged 1 commit intomasterResgrid/Unit:masterfrom

developResgrid/Unit:developCopy head branch name to clipboard