Merge tag jb8u232-b1638.6

Change-Id: I13fbc8292dc40a8a663c71d05647ef9be9172b59