Reconcile with jb-mr2-release - do not merge

Change-Id: I6b893f5e3dfaf567b0e2c5d7eef423556603d1a9