Reconcile with jb-nakasig-release - do not merge

Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e