Reconcile with jb-mr1-release - do not merge

Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba