[automerger skipped] Added multi-band support am: 295d9d42c4 am: 10a7dfb190 am: 16f9289514 -s ours
am skip reason: Change-Id I6018b9df8b8bd0745c3736df764f4569bea28baa with SHA-1 0a00c8d8c3 is in history

Change-Id: I32b4a6e526ae79706a8d81603127a543180bc167