Merge changes from topic 'remove-set-frequency-band'
am: 430904a4ab

Change-Id: Iadf94f5e95f9a53c03115a44594f32aba21ecb4f