Tuna prop updates

Change-Id: I274a48619b52743efe1c47d876fd2c89f5398ebd