Merge tag jb8u202-b1483.39

Change-Id: I46c0b3928bd3b2a16f0340c20e3a3aa863f0607b