And convert users to instantiate it in try-with-resource blocks. Change-Id: Ief1a42ccbf4b3d943a7987b2c9b8077175695515