Reconcile with jb-mr2-release - do not merge

Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea