updates for gift card and buy dependent cloud flows.

These are the last files for the final build. Only critical bug fixes from now on.