Reconcile with jb-mr2-release - do not merge

Change-Id: I38afc7daea87354abdce7a86d78b56f461750b04