Merge "Added CloseGuard for BaseObj" am: 64c4c1c
am: 157c73c

* commit '157c73cab3d24969c2b52a9ec2f9c6fb6cacb603':
  Added CloseGuard for BaseObj

Change-Id: Ic5d51599ef1939c2784f9cc2b693cc2370afb0a0