Update for 4.3.1_r1 JLS36I