Merge "Make change and version bump to OPR1.170524.001" into oc-release