Merge tag jb8u242-b1644.3

Change-Id: Ia40baedd800ead09fa46d305200843e4e32481fc