Reconcile with jb-mr2-release - do not merge

Change-Id: I7aa2dccba44773db134e6bef703ff9477ed159ba