Reconcile with jb-mr2-release - do not merge

Change-Id: I126272e67629e850e151f5601a03812c4b9b1782