Merge "Replace String for 'path' to File" into rvc-dev am: e8de8f21 am: 0069f8c6 am: 710b7213 am: f7f4cffa Change-Id: Id9725a2eacbbf56268a54bb74876e17e1ce664dc