Reconcile with jb-mr2-release - do not merge

Change-Id: I1d5a94ed7749af26f6eb8e5e06443bd83fc63753