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

Change-Id: Iee0ab17de7c7d38a465c6ea387bf317c265f985a