Reconcile with jb-mr2-release - do not merge

Change-Id: I7466882c8312784a2b81935501434cd13dd2c662