change hardware samsung branch

Change-Id: Ie27dea70c1a713538d27131041138b8da6de5159