Reconcile with jb-mr2-release - do not merge

Change-Id: Ia3f9af0bdae21213404ab0835e23378097541be2