Merge "Replace String for 'path' to File" into rvc-dev am: e8de8f21 am: 498e9849 am: d617a0f7 am: aaec5799 am: 62392095 Change-Id: I954e2ae6f9a8438dcf737e3b8d3d77957439cb2a