Expand vcl variable

Change-Id: I963e21dfb80a2f2f67730cc3e86a9e19e9f3d358
Merge "Expand vcl variable" into production