Merge "inode2filename: Fix null pointer dereference" into rvc-dev am: f769b80c32 am: 2d9f2ae50e am: f2a58dc5ab

Change-Id: I8b9f102025ded68eac446d4777289533f2b7e1b2