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

Change-Id: I38555ff34075b7362127e008fcd13cc8291d34ff