Reconcile with jb-nakasig-release - do not merge

Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c