Updating cloudkeep supporting classes

* Switches to the new order format

Change-Id: Ifa8757c27bc792bd07a509c76b581f78ddd5253d
Merge "Updating cloudkeep supporting classes"