Merge tag jb8u152-b1248.8
am: a482fc01a4

Change-Id: I7704bc85558bf06cbde6657acc740f47f4fce9c2