Merge "[automerger skipped] Merge "Migration of IRadio 1.3 types to 1.4." am: c96a716a am: 46fd611f am: f37b105c -s ours"