Merge "[AWARE] Fix close guard method name" into oc-dr1-dev
am: 9aabf29541

Change-Id: Ibdf4c9f91a41ba68c2d5ece4615a12e101638471