Split radio and sap test modules am: 31de7a247c  -s ours
am: 3724307dc6  -s ours

Change-Id: Ia01b1662ac6fa10418b80cbe59d0ecdd0f18a93e