am 7f3d6b69: am 0a5b0166: Merge "Register _cleanup function with atexit"

* commit '7f3d6b69cee423bb726814fb4b929c535b7d607e':
  Register _cleanup function with atexit