Reconcile with jb-mr2-release - do not merge

Change-Id: I55884a9acd85fee2a3b45f5262b074731ca9ea16