Reconcile with jb-mr1-release - do not merge

Change-Id: I1ebb7a397dd05549889ee351fbaa2fde1712cfb8