Merge tag jb8u212-b1586.4

Change-Id: I5190cfb569e64864978012a086ec4818d4eb4da3