Merge tag jb8u232-b1638.6

Change-Id: I0ed78474d13e3bafc2cbf50a4cd10776b0087f3d