Reconcile with jb-mr2-release - do not merge

Change-Id: I30773b20dfe3913483382ba0c9d0c75749e398bc