Merge "inode2filename: Fix a use-after-free bug." into rvc-dev am: 9ba82bf571 am: 357abab0ad am: ee90ead1fc

Change-Id: I46789f03b8cef51ec6537f24c3137988d0d333d8