merge from SGH-N075_JPN_KK_Opensource