Merge "Fix issue where clock inflation would fail" into oc-dr1-dev