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

Change-Id: I709a38970b4b382faf9a384a5112153366075e02