am 58c636c9: am 45550faa: Merge "Don\'t send non-existent system keys." into gingerbread

Merge commit '58c636c9bce624b8cdd33c910d4eb39b856a520d'

* commit '58c636c9bce624b8cdd33c910d4eb39b856a520d':
  Don't send non-existent system keys.