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

Change-Id: Ibc29edeff504067dfb2301cc7a5111eb7c7b486b