Merge tag jb8u202-b1483.39

Change-Id: Ic5bbeb4b362bee6aed513449de8490d541f974a5