Reconcile with jb-mr2-release - do not merge

Change-Id: If97525d2093797d2ad93e0141b858f18dd4811c3