* adds support for multiple sandboxes being present Change-Id: I1556af0a09e1543a9d07131ae6ea1dd8baafcf05