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

Change-Id: I3dfd8ee0a7c0013cd1bb0d39f6fbd745677f5d90