Merge tag jb8u212-b1586.4

Change-Id: I9da87d83909a618b050e336e51b5aa4fff6eff1c