Merge "[automerger skipped] Merge "Migration of IRadio 1.3 types to 1.4." am: c96a716a54 am: 46fd611f85 am: f37b105c88  -s ours"