Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp * commit '8631e55425b2ab81eb74396e6834c6f7a4549804': Fix pairings lost on reboot.
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp * commit '8631e55425b2ab81eb74396e6834c6f7a4549804': Fix pairings lost on reboot.