Merge "Added CloseGuard for BaseObj"
am: 64c4c1c

* commit '64c4c1c1cd24157f93dc3f07f7dff299b7d0c8f8':
  Added CloseGuard for BaseObj

Change-Id: I66e51df82a5af12bfe7654701e89763f81c6e8f3