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

* commit '2113474ae090ee4c6a06864011ce8a4e4cae9673':
  Fix list_for_each_safe macro