Merge "Fix google-explict-constructor warnings in radio." am: f53c1d182d
am: dd25bc5143

Change-Id: Ib52041987d42da26749d78019347f971dd75602e