Adding tt[data-instance] replacement

Change-Id: I71bce0e0935a2ba4f44c82f1075206f40a9eeea7