Temp commit
Updates from samsung-8660