Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2 am: f014e41731 am: 36eeceec84
am: 87b62dc44c

Change-Id: Ie1eeaf4d1e0dc63c80262376720abe96684a2590