Merge tag jb8u152-b1248.22

Change-Id: I9ba434e5b3c1ee21bd0acd0ded237cff65f524fb