Merge tag jb8u212-b1586.4

Change-Id: Iae9396a77c6bbf1eeb78d3970aa21087c26f22c3