Reconcile with jb-mr2-release - do not merge

Change-Id: I1c6be297655eb1d928657bbc6fd7e974ddbf9691