Merge "Added multi-band support"
am: bae34cb9f9

Change-Id: I3e4d86f2e5eb4e17b6c0271c8312d9f3a1f3ce72