Reconcile with jb-mr2-release - do not merge

Change-Id: If556a8aade619e94ef8cf3bfa2f65d4efa2c4550