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

Change-Id: I9416243ecd96c0ff16f30c55ffe7a08d5e9d9c62