Reconcile with jb-mr0-release - do not merge

Change-Id: I210109f82080d0a7b783f7f10a6ca1cc30460405