Merge tag jb8u152-b1343.16

Change-Id: I41eb6922fe0d1746834132f9357c9eedcccd075b