Merge Official KK Samsung source with my source