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

Change-Id: I1e9b6b0f615bdc95d453244f20e493b1442e11bf