Merge tag jb8u242-b1644.3

Change-Id: Icbc3b66de8f779220e5f300a05a13029f76a1e48