Reconcile with jb-mr2-release - do not merge

Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9