Reconcile with jb-mr1-release - do not merge

Change-Id: I74d83ad681e16b5e548eb2be6af985d6349ee83e