Returned to samsung-common Hazy