Merge tag jb8u212-b1586.4

Change-Id: I1f43ec13b78b1f994df9fbc2955925121934e155