Reconcile with jb-mr1-release - do not merge

Change-Id: Id99c83537b1e0ddbfb2f2b8b2b0cfc131df12fe4