Merge tag jb8u232-b1638.6

Change-Id: I9db779113bfae4bb0853a5d13c6114133ada6683