[automerger skipped] Merge "Added multi-band support" am: bae34cb9f9 am: de13132e16 am: 048f18e6ad -s ours
am skip reason: Change-Id I8d5d828ec142c74428388a6d3f11cdf0842e03b9 with SHA-1 66605f1ad3 is in history

Change-Id: I7df9349878f7b09d58f593196767546509262347