Reconcile with jb-mr2-release - do not merge

Change-Id: I326745b5eab66b6e7ec49cb0db1b66db6ca884fc