Fix the ios and android apps and save the princess

Change-Id: I055f8b2ab1038a7341710a2ce7fe9c7f642b6bc1