Merge tag jb8u242-b1644.3

Change-Id: I63388d7cef8a6b2d2fd1c64ee4e612e514e21409