Merge "misc: fix resource leak in populate_fs" am: 28eb2f0a33
am: 79f9ab7a88

Change-Id: I9c8470f15c7b1caee9a7d63b5b4868c2a04a5a98