finally block context managers

Change-Id: I49c152ed7ead97b686d54e936649d72a69974d0c