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