Add overlay for Trebuchet default workspace

Change-Id: I4a36b801227393c8d6949fb25588d08a9c74e058
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD