Reconcile with jb-mr2-release - do not merge

Change-Id: I1bf36dd86f8c7a12978de0de6d9c19ec615f78e6