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

Change-Id: Id374d1065fa2934a58bd14fe8f7e9dc7b3514ad8