Reconcile with jb-mr2-release - do not merge

Change-Id: I7b13f5e954578c6cbafa6acd1510c1d0f257661e