am: 9bf367030c * commit '9bf367030c24e93c711d2ba9ca5594e70a652596': Handle renamed packages during default grants