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

Change-Id: Id8921caaa55958f4f9b16a303f7b423d2a894a2a