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

Change-Id: Ib382f1f7311e1562b4683eb3d545d1525d8a8533