Merge tag jb8u242-b1644.3

Change-Id: I2a25210bd56619352102d0684e4bec3136da0c3b