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

Change-Id: I49cfad8484df3db631c73547499bdf2a75bb0d48