Merge "SF: Fix IGBP list leak" into pi-dev
am: 891f1c0c80

Change-Id: Ice33ccfffce02febdf620496551a3a5042bee730