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

Change-Id: I949e65bb49ab35d01f41f9ff8df74c2a735c8675