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