Update Device AND Changes for Radio FM

Change-Id: I4628719abf6ecc95b0a6386cebd9ed2b91025058