Reconcile with jb-mr1-release - do not merge

Change-Id: Ic10126a26c648cbf7402c5e699ec4aea7240fe6e