Reconcile with jb-mr2-release - do not merge

Change-Id: I777d9066b0b198cfcb65bd17b8206d9d046b8d51