Reconcile with jb-mr1-release - do not merge

Change-Id: Ib413b5627f3ab9e6fa6d8fc1775da5f12a704b14