Merge "Use OS package name when identity cleared." into pi-dev