Update TemplateSandbox for bug 66141

Change-Id: Ie3e6d68c2f605413d63dd5d40c493de041308370