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

Change-Id: Ifa644f4630408fbad1d5587a7df5da1317caea01