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

Change-Id: I84e72ce2b25b8ad8fb19eab528104934d54bd6ed