Consolidate tuna props

Change-Id: Id97545c2f73710269577db0c0d3214883690b6c8
tilapia - KOT49H binaries

Change-Id: Iddfe9e9069de92c5517dcb2935502de7df8f93d7