Reconcile with jb-mr0-release jb-release

Change-Id: I10c1743cce5380ca689dee0dad605ec2b3b43799