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

Change-Id: I4520610c65057a87aaaf270c1cd84fffaf91d7e5