[automerger skipped] Merge "Fix bands logic in RAS conversion" am: 5ad34314 am: 7094c366 -s ours
am skip reason: Change-Id Ibe9a9ae66c165b13b88e11b03b05b1b815c37323 with SHA-1 d9b259aa is in history
Change-Id: I47c95d7eabb0a5a8c0be873dfbdfbcf523fd41e9