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

Change-Id: Ib3132857e187bf48ce9a3f427cc89f3b70a8255c