Merge "Create location  to store surface and window trace files on init" am: 3dfba33d67
am: 4d736b5fa5

Change-Id: I11aadcaf6bf50b02126e021b6acb049d570271cd