am: 0810732a * commit '0810732a': Add missing "try ... finally" safeguards Change-Id: I227ab98f33c025543e4ac4adf16453acd6159713