Reconcile with jb-mr2-release - do not merge

Change-Id: If1ae235f07c2cfe4184e9a18d1fe110a54955e20