Reconcile with jb-mr1-release - do not merge

Change-Id: I550ab10aacb9f001cd04177d192a4094a20a4f5e