Merge tag jb8u152-b1343.16

Change-Id: Ib5e79ec062198e4a8e16283f7b4abed6157c3dd2