Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp * commit 'bf2efbc0642d07acee1a83c17987abb380e5243a': Revert the channge where channels were not selected randomly.
Merge commit 'bf2efbc0642d07acee1a83c17987abb380e5243a' into eclair-mr2-plus-aosp * commit 'bf2efbc0642d07acee1a83c17987abb380e5243a': Revert the channge where channels were not selected randomly.