Fix: Updated Cloud Servers concepts after code review
Closes-Bug: 1295718
Change-Id: Ie128f353c5bcc963fff6e234a949762bfd6c19ac