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

* commit '21ab13ff743fda1cec1923a8dec6b5553a514759':
  Don't null class member before using it.