Reconcile with jb-mr1-release - do not merge

Change-Id: I029549918f3f7236eb5e058372221167d8618a70