Consolidate tuna props

Change-Id: I9653f5e7e91e79de5fcd7748b7d7b83d4fb7e91f
tilapia - KOT49H binaries

Change-Id: I1b51d69870d969276f761c5c024f343a89f8cbe7