am 3816fa8b: am 21ab13ff: am 474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev

* commit '3816fa8beec3592360bf4ec1c4dde22c271b17f9':
  Don't null class member before using it.