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

Change-Id: Ib86bfa674e7799b7ab56e550ef9a16f796b2d039