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

Change-Id: Ifd6a7c5d8ff3f86253b50294b86143a4ada2c915