Reconcile with jb-mr2-release - do not merge

Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d