Merge "Removed reference to RadioAccessFamily"
am: b13a4ef322

Change-Id: I982ca4865d7aed198a1e1f78c80f0340218d27a2