Merge "Trim root path from output" am: b7c162435b am: 89b12b6f0b am: 9462843907

Change-Id: Ie9dbcf3ba23259c3f8772923fab4309aebce0a6c