Merge "Add the missing 'import stat' line." into oc-dr1-dev