Reconcile with jb-mr2-release - do not merge

Change-Id: I0af162f4a7b936cf5034d35efc6823ae49735d05