Merge with SCH-I959 CHN KK Opensource Update1.