Reconcile with jb-mr2-release - do not merge

Change-Id: I03c3bb1f4a08904ebc079b90aa6eec4f61e7dbaa