am cdb9ea79: Merge "Package checks for resloving recovery tokens should be...
am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev
* commit 'cdb9ea79':
Package checks for resloving recovery tokens should be user sensitive.