Merge tag jb8u242-b1644.3

Change-Id: Ia293281ba59909dc79c4dbfcad0d4a49edf785a2