Merge "Trim root path from output" am: b7c162435b

Change-Id: If7db732fa5a1e267c777c0610608dc3492a77749