Re-path shamu props

Change-Id: I2f21f5c747d7b9b54fc2e22e8d14877b122ce8cc