Reconcile with jb-nakasig-release jb-mr0-release - do not merge

Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca