Reconcile with jb-mr2-release - do not merge

Change-Id: Icce5a029a8cfb3444ece5f8c489f75619ed67a77