Merge "Migration of IRadio 1.3 types to 1.4." am: c96a716a54
am: 46fd611f85

Change-Id: I644d716331a36c1e311c395299dd75a71ccdb6bf