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

Change-Id: I0f28c240cc474bf975e9b8b1ece8b5da20b57e11