Merge "Make change and version bump to OVM1.211007.001" into oreo-mr1-vts-release