Merge in GT-I9301I_EUR_KK_Opensource_Update2