Merge tag jb8u212-b1586.4

Change-Id: I023373c0933fb0f01e71c7aa2dbec6a0a8f5046f