Merge "Replace String for 'path' to File" into rvc-dev am: e8de8f21bd am: 498e98492e am: d617a0f794

Change-Id: I7a72d831066cd8c0e47fd8c89507a716abfea72a