Merge tag jb8u202-b1483.39

Change-Id: I80a7207d2b76081d4fa5167ef038b235e3614397