Reconcile with jb-mr2-release - do not merge

Change-Id: Iec327c611f56804aeddd1a4310e967b9fd6c7467