Reconcile with jb-mr1-release - do not merge

Change-Id: I51e7a05d068725eb54c9cc38ab770707f7082c62