Use our Samsung props

Change-Id: Ia58af18daaade5d0e283a75bb1b6547a8820dd4b