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