Fix the ios and android apps and save the princess

Change-Id: I055f8b2ab1038a7341710a2ce7fe9c7f642b6bc1
(cherry picked from commit d82dff738945ede2c18ee18868b5e90b27cebdd8)