Merge "Use normalize-path-list" am: c034cd5d04
am: f01f51c41f

Change-Id: I91e2c6635a93d8c6beedc75e159af613d3282ca0