Fix pairings lost on reboot.

Bug:2277376
Dr No:Eastham
3 files changed