Add support for individual bucket closing.

Change-Id: Ia285d01592cd7abef333680dc40b7cac0893edd1