Prepare mobile VCL for multi-tier setup

Change-Id: I9175680d3de31cfaaa42716774adc049b5327bf0