Reconcile with jb-mr2-release - do not merge

Change-Id: Ic1c996fd98ce4f0db3bbe40a3f3fe9cb1504d3ab