Merge "Add command line strictness to VTS" into oc-dev am: 5ed473340c
am: 9d87d323e3

Change-Id: I2a80cf0a9269831f31bc1641145a93955d822bd5