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

Change-Id: I31bd348037ac3d9d6098db868e946f5b479f6b07