Fix vm_test_mode

- It was previously incorrectly generated.
- Fixes bug 1201694.

Change-Id: I802bbd0ced8f12064189db7d707fbb6ca09113bb
Merge "Fix vm_test_mode"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp