Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2
am: f014e41731

Change-Id: I000919a98192d639b8797e9c55e49f3cabd5ed4b