Fix for java.lang.Throwable: Explicit termination method 'close' not called

Change-Id: Id8988840efecb7e1d95b7279f9fe0bc144f9c74b
Change format

Change-Id: I33501ad2a95545b810d96ff0811cf2d46f82822b