Merge "Replace String for 'path' to File" into rvc-dev am: e8de8f21 am: 498e9849 am: 82b0b54e am: 7ade30a1 Change-Id: Ic5494e31842e027ee8a8d7c3bcdda89ee412331d