am 17c3a227: am 617c28b8: Merge "Fix list_for_each_safe macro"

* commit '17c3a227505988b33e1219a8e0a921de874f9b70':
  Fix list_for_each_safe macro