Tilpia Prop reconcile + slowly adding tf700

Reconcile with Codefire as they seem the best organized for tilapia

Change-Id: Ieabcfc0819de8af2352de22d258e66046cfba7db