Merge "Make change and version bump to OVS1.210108.002" into oreo-vts-release