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

Change-Id: I532d5b1c4dd81d4f51b45cc60b17a13533ffceca