Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken * commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02': Bug 2680071: Rename the Cloud to Device
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken * commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02': Bug 2680071: Rename the Cloud to Device