Merge "Added multi-band support" am: bae34cb9f9 am: de13132e16

Change-Id: If2eaa5d5d39b5bc4c20fd863fd5c0e008cb8e579