Merge tag jb8u232-b1638.6

Change-Id: I80120f4e90208c33381df422df070ac4d1857e24