Merge "[AWARE] Fix close guard method name" into oc-dr1-dev