Merge tag jb8u212-b1586.4

Change-Id: I9e0241d90097aa681d96ff6573e147caf9a2db39