VCL is not C...

Change-Id: Id48b537169cfc71d4867f5f10bbb1524a6aeb2a7
Merge "VCL is not C..." into production