Merge "cast Path to string type" am: 95cc0dd43f am: 1408067bb6
am: 77d6d86e0a

Change-Id: I6241ef3f854fe8b633784f502173a861aee5cc5a