Avoid running 2 radio commands in parallel in the same channel

Change-Id: Ie6f5d64d39170a2796f10bc8e81c775d6e4ed6dc
Merge branch 'cm-10.1' into martincz