Merge "OemLock functional VTS test." into oc-dr1-dev