Update props from Ziyann for tuna

Change-Id: I33aa17c799481cde9ffbd1992bff4bc782bbc619