Reconcile with jb-mr1.1-release - do not merge

Change-Id: I8f9de7a20cf390ce9e6fb729554a31a4be593a45