Reconcile with jb-mr2-release - do not merge

Change-Id: If7f39233ef7f924e88683aa3fbb7d4e99ab30a4c