am 617c28b8: Merge "Fix list_for_each_safe macro"

* commit '617c28b8f2c9b90efa8b164ce2af2c7cd3007fbd':
  Fix list_for_each_safe macro